Merge "aconfig: use proto struct directly" am: 23788f85 am: 7639e644 am:...

Merge "aconfig: use proto struct directly" am: 23788f85 am: 7639e644 am: 6a5ce4a2 am: 0531aac8 am: 19963ac8 am: 4bbbbf6a

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



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