[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: b13b741a am: 22d3aa35 -s ours am: b4974f9c am: b5ba21e8 -s ours am: 3af765c2 -s ours am: c67849d8

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

Change-Id: Ic40e63e366caa865828c7fbc06c122a511c114b5