Merge "Fix floss build breakage "bt_transport.h" not found" into main am: 231e391f am: d5cf9b98

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



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