Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3515715 Change-Id: I8d1614a66cde3c8cb065c2f5dd42a3e061a7c3d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>