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