Merge changes from topic "code_metadata" into main am: 4c3e2df157
am: ab279a0571
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2852607 Change-Id: I603c630746793e6d22820c3d0582c7aafafbac1b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: