[automerger skipped] Merge "Fix proto invalid write type" into tm-dev am: 005da24a4c -s ours
am skip reason: Merged-In I4654350a59dc1ca1a925785ad37f34aa7b481235 with SHA-1 746f2aa07e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17076608
Change-Id: I0c85a7560d68e13bec00e87b7e52b02f8aa8d2ef
This commit is contained in: