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