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