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

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



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