Merge "aconfig: update aconfig cpp integration tests" into main am: 97ae9d35

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



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