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