Merge "Pass includes attrs to cc_aidl_library" am: 47137978 am: 453a6fc5

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



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