[automerger skipped] Merge "Fix proto invalid write type" am: a036ac4569 am: fc91e9d11f -s ours am: 97d49c08a1 -s ours

am skip reason: Merged-In I09cae385050e569b1da98ad7de0e226b13ee6895 with SHA-1 5d977f4b84 is already in history

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

Change-Id: I12a52363fb7dc18c1a68596ae5bdd43716085297