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