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