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