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 am: 5815ece2

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



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