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