Merge changes from topic "aconfig-prepare-for-proto-structs" am: a99ac90e...

Merge changes from topic "aconfig-prepare-for-proto-structs" am: a99ac90e am: 36e4f3fb am: 643be21c

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



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