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