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