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