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