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