[automerger skipped] Merge "Fix for out-of-bound error regarding NoCopySpan objects" into tm-dev am: 92e59dde am: fcd285b6 -s ours am: 7cde239b -s ours

am skip reason: Merged-In I2e4a0a3745bb3a53d8f22d4090cdf4d93e19116b with SHA-1 484f7b4d is already in history

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



Change-Id: I8ffa620d0e5b7320068d3590294b78321e65009c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>