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