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

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



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