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