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