Merge "[RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged" into rvc-dev am: 8ccca289bf

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

Change-Id: Id318733ca9c703465134397171205b14aea48490