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