[automerger skipped] Merge "Moving over core/api/*txt files" am: 268d01fb...

[automerger skipped] Merge "Moving over core/api/*txt files" am: 268d01fb am: 232de1de am: 811aa14b am: c88ca655 -s ours

am skip reason: Merged-In I9cc8086b3e98bfa821b402250dcb9b233178d4b6 with SHA-1 c7938375 is already in history

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

Change-Id: I49a52e5d8655e21d7fab25cd450bac2861234d74