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

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



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