Merge "Merge "Allow apps with BLUETOOTH permission to control system routing"...

Merge "Merge "Allow apps with BLUETOOTH permission to control system routing" into udc-dev am: 0871ce45 am: 7cd74d9c" into udc-d1-dev-plus-aosp am: 6dad1db1

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



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