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

Merge changes from topic "fix-aidl-mix-ports-and-bt" into main am: eafa78c9 am: 002c58fa am: 78d8c4dd

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



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