Merge "Replace locking JNI array methods" into tm-dev am: 36e07fa1

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



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