[automerger skipped] Merge "release config is now protobuf" into main am:...

[automerger skipped] Merge "release config is now protobuf" into main am: e6370eae -s ours am: d8cb6f3d -s ours

am skip reason: Merged-In Ia3ae6787183208a216dc4ea26c2fc3a9e4f56054 with SHA-1 b681b9f9 is already in history

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



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