[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: b13b741a94 am: 22d3aa3546 -s ours am: b4974f9ca1

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

Change-Id: I25d9332210a251826ccb6f32384a6a47980e5c0e