[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged" into rvc-dev am: 8ccca289 am: a4d9f5cd -s ours am: c4176226 -s ours am: 195fe536

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

Change-Id: Ib72d200d6a7339efe013332906e6045224b5acb6