Merge "[RESTRICT AUTOMERGE] Fix potential out of bounds writes in LogEvent." into rvc-dev am: 0992a32def am: e3b7b329c9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie81d4767c721674124bf7e4b00778c85f67440da