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