[automerger skipped] Merge "Changing BluetoothHeadset APIs from @hide to @SystemApi" am: 2ef5e10f45 -s ours am: f46dea86b0 -s ours
am skip reason: Merged-In I02b2e7e5e0be3b462f7c25b655e669e2c7fe47eb with SHA-1 ce1d2e1fb4 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1804490
Change-Id: I0e182dc4bb0e37fae0e0ed9ea0272f855fd3b4d2
This commit is contained in: