[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 -s ours am: bda5a1a6

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

Change-Id: Ib2a8c551cafeb533b7aa09b061ca9ea0051da899