Merge "aconfig: simply proto" into main am: db0c8d79 am: 91e478d0

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



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