Merge changes I5a051571,Icbda534f,I67d81723 am: efd7b58a am: d24786ac am:...

Merge changes I5a051571,Icbda534f,I67d81723 am: efd7b58a am: d24786ac am: 7c03276f am: 13c8b449

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



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