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