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