Merge changes I0a7655b3,I60d0b82b am: c159afca am: eda4a0d2 am: c73b28ef...

Merge changes I0a7655b3,I60d0b82b am: c159afca am: eda4a0d2 am: c73b28ef am: 2ae6ffa5 am: 9aa1e2b4 am: 2a9c2dd8

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



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