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