Merge changes from topics "bluetoothrestrictions", "headlessfixes2" into...

Merge changes from topics "bluetoothrestrictions", "headlessfixes2" into udc-dev am: 9d319e4d am: 45e80e91

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



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