Merge changes from topic "code_metadata" into main am: 4c3e2df1

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



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