[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged" into qt-dev am: d5416772c5 am: 421bb6ab1d -s ours am: b86fafbd58 am: 7e4f62f44b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I347547a627fbda4a0f2024b8e563227418726fbe