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