Merge "Fix proto invalid write type" am: 0066692a4e

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

Change-Id: I2b588ebe0ed9e61475901de6e32f8c8efa920511
tree: 3f7d3ee79d3bca4c3c04a44185495db038b365ff
  1. framework/
  2. framework-t/
  3. service-t/
  4. tests/