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