[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix potential out of bounds...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix potential out of bounds writes in LogEvent." into rvc-dev am: 0992a32d am: e3b7b329 am: 278b741e -s ours am: 58a01b99 am: 350911f5 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4178ed33ab0d6122a22f3817dfcb291fe9084dfc