[automerger skipped] Merge "Require protobuf for build flags" into aosp-main-future am: 3694e76222
-s ours
am skip reason: Merged-In Ia33aae158d62c12666d97449cea0c02b60550a21 with SHA-1 8663122eac
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27829755
Change-Id: Iee1d23450457d468d57c372ecee0726ac7ea54fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: