Merge changes I0eb509c0,I57e4ff86 am: 0d54e3ea am: ef9f0622 am: a73e8b4a am: d20168d8

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



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