[automerger skipped] Code metadata integration with Generator tool am: 8f986c3f -s ours

am skip reason: Merged-In Icf14b48bc777207ac7cc7a287a174c8de817339b with SHA-1 d96041a0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/25828975



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