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