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

[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9f -s ours am: af533b33 am: e72a13d4 -s ours am: 4ad8ef14 am: d4b7b0e3 -s ours am: 3f2ba9c9 am: 7cdb4f59 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4c6e3042b492e17c86d873500b15600b94798867