[automerger skipped] Merge "Fix proto invalid write type" am: a036ac4569 am: fc91e9d11f -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: Ib48894c6ff2e359746ba017d9b9c59c7de18396a