Merge changes from topic "kotlin_kythe" into main am: 6556d043

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



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