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

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



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