Merge changes from topic "fix-aidl-mix-ports-and-bt" into main am: eafa78c929

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2877679

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