[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 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: Ib55539cb956b7b40ac070b03cc8128e0e9d8d53f