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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged" into rvc-dev am: 8ccca289 am: 484ef757 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib5c2e0ca1d9a84e54d4c41b0e12f5f2a260b7d24