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