Merge "Update jni to get int descriptor in native layer" am: 1bd8cd59a5 am: e1874186ba am: 54e430d69a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc0ac9def6a0a05658235b61f36ef8829906c341