Merge "Return with error logs instead of exception for unexpected nsi" am: 7650725304 am: 50caf534ec am: c611a65cf8

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

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

telephony/java/android/telephony/TelephonyScanManager.java

@@ -153,8 +153,9 @@ public final class TelephonyScanManager {
                     nsi = mScanInfo.get(message.arg2);
                 }
                 if (nsi == null) {
-                    throw new RuntimeException(
-                        "Failed to find NetworkScanInfo with id " + message.arg2);
+                    Rlog.e(TAG, "Unexpceted message " + message.what
+                            + " as there is no NetworkScanInfo with id " + message.arg2);
+                    return;
                 }
 
                 final NetworkScanCallback callback = nsi.mCallback;