Merge "Make rfcomm sniff timeout configurable" into main am: 8abac319 am:...

Merge "Make rfcomm sniff timeout configurable" into main am: 8abac319 am: d44714f7 am: 5c6a16af

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



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