Merge "Fix incompatibilities with Protobuf 22.x." into main am: 68d41126d5

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/3004513

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