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