[automerger skipped] Merge changes I47f206c2,I04774fe4 am: 9e1ba337 -s ours...

[automerger skipped] Merge changes I47f206c2,I04774fe4 am: 9e1ba337 -s ours am: 9c1904bc -s ours am: b46b0395 -s ours am: cb654173 -s ours am: befec6d2 -s ours

am skip reason: Merged-In I47f206c24bde11e28c13869b326461b3e76bbc7a with SHA-1 a3051e22 is already in history

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



Change-Id: I2088ebfd0f7a233fe067b6c096a12dd8a9889bfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>