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