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