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