Merge changes I682f1e43,Ib5435169 am: f01a7695 am: 7de9f048 am: e8946829...

Merge changes I682f1e43,Ib5435169 am: f01a7695 am: 7de9f048 am: e8946829 am: bd156650 am: eee93d17

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



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