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