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

Merge changes I0a7655b3,I60d0b82b am: c159afca am: eda4a0d2 am: c73b28ef am: 2ae6ffa5 am: 536ac6df

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



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