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