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