Merge "Fix proto invalid write type" am: a036ac4569 am: 18fe57024e

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

Change-Id: If6515e493e15e4dcb14108e0c165110f15ef9f31