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