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

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

Change-Id: I64772539c56e192e76b412048e94d8e7711eb403