Merge "aconfig: update codegen templates" into main am: e381a17c am: f0b2dfed am: bf18e8f4

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



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