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