Merge "Call the right JNI helper." am: e032bc4139 am: a029521318

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

Change-Id: I89ef86a02751c9f591b725c9a693cca6bd44f225