Merge "Fix for out-of-bound error regarding NoCopySpan objects" into tm-dev am: 92e59dde

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



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