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