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

am skip reason: subject contains skip directive

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

Change-Id: Ib58ee3f73039b66e9e689b5642d17c7a4a99635b