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

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



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