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