Merge "aconfig: aconfig storage cpp api on device integration test" into main...

Merge "aconfig: aconfig storage cpp api on device integration test" into main am: c670bae6 am: e0101ed3

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



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