Merge "Make aconfig c++ generate only one header and only one .cc file" into...

Merge "Make aconfig c++ generate only one header and only one .cc file" into main am: 289fdf21 am: c943f4c1

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



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