Merge "Add option to use protobuf3" am: b611cf42 am: b9897e60 am:...

Merge "Add option to use protobuf3" am: b611cf42 am: b9897e60 am: d33ebbc4 am: f0224c26 am: d4f2f596

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



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