Merge changes I92d3dff1,Id3740996 am: bb41b17d am: a7124d67 am: 0bddcd99

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



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