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