[automerger skipped] Merge "Changing BluetoothHeadset APIs from @hide to @SystemApi" am: 8111b5cf61 -s ours

am skip reason: Merged-In I02b2e7e5e0be3b462f7c25b655e669e2c7fe47eb with SHA-1 ffab995560 is already in history

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

Change-Id: I84d8265b2cdbd6f5ed005d968f04b9f27f1aee79
tree: bee1104799b559076f31142c25905a201d23ed12
  1. framework/
  2. service/