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