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

am skip reason: subject contains skip directive

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

Change-Id: I4f376c74d22d48d9032d5bd557ba4a2d8a40d1c6