[automerger skipped] release config is now protobuf am: f982547c -s ours am: 7a84bd5d -s ours

am skip reason: Merged-In Ia3ae6787183208a216dc4ea26c2fc3a9e4f56054 with SHA-1 b681b9f9 is already in history

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



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