Merge "[automerger skipped] Merge "Make BluetoothHeadset APIs used by Telecom...

Merge "[automerger skipped] Merge "Make BluetoothHeadset APIs used by Telecom into System APIs" am: c3c651dd am: 9a9f985f am: a5d87a88 -s ours am: b36b8340 -s ours" into tm-mainline-prod am: 367d3eb3 -s ours

am skip reason: Merged-In I13d6f553f5b9d6ca7c2ae9a42450875b16cd1490 with SHA-1 0eeb1d32 is already in history

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

Change-Id: I6dbdb871e942d9a6923b2204436341009193f865