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