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