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