Merge changes If47a6350,Ib795d8d8 am: 2d58918e am: eb38a571 am: ada957e4 am: 15a8e39b

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



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