Merge "Sandbox c2hal_test_genc++[_headers]" into main am: b12a9865 am: 28268703

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



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