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