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

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



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