Merge "Created kotlinAttributes struct" am: eb33a1d474 am: f8cf202b64

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

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