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