Merge "Handle cases where exceptions may be thrown." am: a0d573ecd4 am: eccc13728f am: a4d8e2e5b6

Original change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2430694

Change-Id: Iaafa2850624b1cee5cb2823eae91ea958b955f20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>