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

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



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