[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am:...

[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9f -s ours am: af533b33 am: e72a13d4 -s ours am: 4ad8ef14 am: bc9a8147 -s ours am: 61932ba1

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

Change-Id: I6d8e3eb75a995ff24739eba6f44ed4406b394636