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

am skip reason: subject contains skip directive

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

Change-Id: Ifbe9c65da8bef3dd74ab913d96229478169125e7