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

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

Change-Id: I23c51a4c7c7372b9aa6fadc4c979b8e6ee7d6b4a