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

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



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