Merge "Return with error logs instead of exception for unexpected nsi" am:...

Merge "Return with error logs instead of exception for unexpected nsi" am: 76507253 am: 50caf534 am: c611a65c am: efa9b995 am: 88c2c15b

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



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