[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: cc0bba36 am: eeeceb42 -s ours am: 5981a94a

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

Change-Id: I476a769572125a736bebfe700981379133427b1e