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

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



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