Merge "aconfig: add missing string header to template" into main am: 268e4455 am: e857396e

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



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