Merge "Fix proto invalid write type" am: a036ac4569

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

Change-Id: Ib0a14fa17c4c6e67e6d05e08b2eb84182550f8f7