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