Merge "support aidl bp2build changes" into main am: dec9ce66 am: 49ff8dda...

Merge "support aidl bp2build changes" into main am: dec9ce66 am: 49ff8dda am: c56fc857 am: eb0efe0d am: 02369ac6

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757771



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