Merge "aconfig: cpp test-mode lib" into main am: 8e571eea am: a3c3cdce

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



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