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