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