[automerger skipped] Merge "Fix proto invalid write type" am: 643462ff am:...

[automerger skipped] Merge "Fix proto invalid write type" am: 643462ff am: 9d4ca1d6 am: ad963e59 -s ours am: ad2185f6 -s ours

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

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

Change-Id: Ic18735a694e14f4163b65773c91197ad58ad993d