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