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