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