Merge "Merge "Pregrant the nearby device permisison for SetupWizard." into...

Merge "Merge "Pregrant the nearby device permisison for SetupWizard." into tm-dev am: d42a883b am: 1244a5a2" into tm-d1-dev-plus-aosp am: 4a5c049b am: 955321cf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18178891



Change-Id: Ie2bc445180a6c6dc6403414da4cadeb517d5aa14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>