[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix OOB write in...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged" into qt-dev am: d5416772 am: 421bb6ab -s ours am: b86fafbd am: 2b7237db -s ours am: aff927f7

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

Change-Id: I12f9fecfb45073b9e9b7d9efa0698644737d773f