[automerger skipped] Merge "Fix proto invalid write type" am: a036ac4569 am: 18fe57024e am: 04eb319ab6 -s ours am: b793c4cc46 -s ours am: 05b21f2ed4 -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: I41dc00ea215cb31e62b01d61031d25cc45c86bab