[automerger skipped] Merge "Add pre-grant bluetooth permissions for AUTOMOTIVE SetupWizard" into sc-qpr1-dev am: 773a974b8a am: 9f54c0467a am: 0128099523 -s ours
am skip reason: Merged-In I156c990d95b92295da5ede28aaea67f1aa63b596 with SHA-1 d0636e18d8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15983244
Change-Id: I3983b9d3ce54fc1d9947cf16ebcc40ba988066e0
This commit is contained in: