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

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

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