Merge changes from topic "rfc_slot" into main am: 05cf6d5c am: d12f61c7...

Merge changes from topic "rfc_slot" into main am: 05cf6d5c am: d12f61c7 am: 2754c82c am: 2c18f3a3

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



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