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