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