[automerger skipped] Merge "Make BluetoothHeadset APIs used by Telecom into System APIs" am: c3c651dd07 am: 9a9f985fd2 am: a5d87a885b -s ours
am skip reason: Merged-In I13d6f553f5b9d6ca7c2ae9a42450875b16cd1490 with SHA-1 0eeb1d32b4 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1932883
Change-Id: I790f872ccfca133ed74a6a9521b09cc03e813a67
This commit is contained in: