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