Merge "aconfig: Fix missing header in the generated c/cpp code" into main am:...

Merge "aconfig: Fix missing header in the generated c/cpp code" into main am: 2cb7622d am: fe1cb899 am: 373346a4

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



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