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