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 am: 3a2c0894

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



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