[automerger skipped] Merge "Fix after API_review" am: 90918237 am:...

[automerger skipped] Merge "Fix after API_review" am: 90918237 am: 3cdee2f9 am: 6d6fc9a2 -s ours am: c57caf83 -s ours am: 7a960929 -s ours

am skip reason: Merged-In Ia6aa778d6bdc0319266c52a84633ee593eaa7eb0 with SHA-1 4c28ea22 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2012898

Change-Id: I8806db677c94acfa6945a20a02190b7ba30ab1c9