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