[automerger skipped] Merge "Fix proto invalid write type" into tm-dev am:...

[automerger skipped] Merge "Fix proto invalid write type" into tm-dev am: 005da24a am: fc3da214 -s ours

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

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

Change-Id: I7b934ab18d71cdd147b431c0c6c8fce65d7416ab