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