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

[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: b13b741a am: 22d3aa35 -s ours am: b4974f9c am: 738641a1 -s ours am: 6d322d7c

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

Change-Id: I74cc4ef081d0d7507fce73a0bdfd026194183dd7