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

am skip reason: subject contains skip directive

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

Change-Id: I5cd9bf9b9e7507c0703eebd18fce4d2895af7c9e