Merge "Update jni to get int descriptor in native layer" am: 332aae3a6e am: c1e552c667

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4415671e964346ea31844d0a7ed65459ffe338b2
tree: 76b53c332a4be2721bcbe67926817a9f54ad9774
  1. core/
  2. service/
  3. services/
  4. tests/
  5. OWNERS