Merge changes from topic "jni-errno-exception" am: 4a6c12e650 am: 3d82c63d2f am: d5258c36f1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5cb0d95a0eaab330b0763927c92495e50b97cd27