Merge "Pregrant the nearby device permisison for SetupWizard." into tm-dev am: d42a883b31 am: 247c57a2e1 am: 8de13b960c am: 68cd80e690
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18178891 Change-Id: I58d7d6c5505760cdd72642312c5b191b4a43e413 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: