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: d244a7f6

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



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