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

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



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