[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: cc0bba36c7 am: eeeceb42ce -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7c100399c2c7db1448b4ad14e9a3fd57a311da0b