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