[automerger skipped] Merge "Update test mode codegen for nextfood" into main am: 8b1dd186 am: 7e8049e6 -s ours

am skip reason: Merged-In I4267ac9eb1fc6b068a8808e76d698a12936e31b6 with SHA-1 dea2d7ce is already in history

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



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