Merge "Fix proto invalid write type" am: 643462fffd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2005270

Change-Id: I2b588ebe0ed9e61475901de6e32f8c8efa920511