Merge changes from topic "net_test_btif_rc" into main am: af972a2d am: 1e8fe259

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



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