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