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