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