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