[automerger skipped] Merge changes from topic "mig" am: 7e8af675 am:...

[automerger skipped] Merge changes from topic "mig" am: 7e8af675 am: 2dd3ce73 am: 570df21f am: 533812c6 -s ours

am skip reason: Merged-In Ib0a205bc575e4cc3cf97eac539cd303acd878134 with SHA-1 7901c005 is already in history

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

Change-Id: I941083dd076ff50fccbaba9c59841e6dc35cb365