[automerger skipped] Merge "Merge "Allow apps with BLUETOOTH permission to...

[automerger skipped] Merge "Merge "Allow apps with BLUETOOTH permission to control system routing" into udc-dev am: 0871ce45 am: 2e27842b" into udc-qpr-dev am: ed02de61 -s ours

am skip reason: Merged-In If9bbfc7574e637aa4c07701edf1f2b12e27e4f52 with SHA-1 a633224a is already in history

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



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