Merge changes I0a5ed3c2,Ib4881212 am: 08e5382a am: 0b9043a3 am: 8bff2e68...

Merge changes I0a5ed3c2,Ib4881212 am: 08e5382a am: 0b9043a3 am: 8bff2e68 am: 8613f74e am: 279d8bee

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



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