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