Merge changes from topic "net_test_btif_rc" into main am: af972a2d am: 0c84bff2

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



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