[automerger skipped] Merge "Fix proto invalid write type" am: 0066692a4e am: f51ff6ed99 am: 3242c60f30 -s ours

am skip reason: Merged-In I4654350a59dc1ca1a925785ad37f34aa7b481235 with SHA-1 5fbd57eab4 is already in history

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

Change-Id: I97aa6e9a43e1c3fc2001ddf9066ebc32ce66fa9c
tree: 11fa2f3d2769e07647d035ca2031cb3b2fd496ec
  1. framework/
  2. framework-t/
  3. service-t/
  4. tests/