Merge changes from topic "oob_sl4a_cert_test" am: 96b86320 am: 21c2e6ef...

Merge changes from topic "oob_sl4a_cert_test" am: 96b86320 am: 21c2e6ef am: a4a64384 am: e0bbe9b5

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



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