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

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

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



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