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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4106aed41c8e00a27fa8fb6dbc4dba5ac08d6c2