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