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

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



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