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