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

Merge "[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9f -s ours am: af533b33 am: e72a13d4 -s ours am: 4ad8ef14 am: bc9a8147 -s ours" into sc-dev am: ac1f0eb4

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

Change-Id: I2946249b6a3787b952ae2dcfd79defa96dd011c1