[automerger skipped] Merge history of Bluetooth API from frameworks/base am:...

[automerger skipped] Merge history of Bluetooth API from frameworks/base am: 633e571f am: 7cf0852c am: 94d833d3 -s ours

am skip reason: Merged-In I7261e9b61296a49c8f8c374a9596ad0b5d749dd0 with SHA-1 d23c0ac2 is already in history

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

Change-Id: I1b1b6adb60c32464dd722ff61332e7a7dbff4ee7