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

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

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



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