[automerger skipped] Jarjar com.google.protobuf am: 84ba8158 am: b9463a66...

[automerger skipped] Jarjar com.google.protobuf am: 84ba8158 am: b9463a66 -s ours am: 55265b63 -s ours am: 166d469b -s ours am: bb136496 -s ours am: f73d9fef -s ours

am skip reason: Change-Id I3339e47c1ca1cd8b0186da0dbf880eff245b4c67 with SHA-1 e7c00c4b is in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1402472

Change-Id: Ie6e282d9e89a6a991497937e09c0b523c779517c