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