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