[automerger skipped] Enable build flags in protobuf am: 69b2ed66 -s ours

am skip reason: Merged-In I1d84db76b157082fc7db1b3cb7c9afe8cdf46cbf with SHA-1 20dd4c23 is already in history

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



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