[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix OOB write in...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged" into rvc-dev am: 8ccca289 am: 484ef757 -s ours am: ed0ba636

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

Change-Id: I7958dda58701a6c8fde0bc8cd0d2f28717ed9cf9