Merge changes I3e25da4e,I750bf034 am: 4ebf2132 am: 67fef878 am: e5e3009c...

Merge changes I3e25da4e,I750bf034 am: 4ebf2132 am: 67fef878 am: e5e3009c am: eb55326e am: 634a52e7 am: 99c925f4

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



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