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