Merge "Abort NetworkScans when Phone Process Crashes" am: ed7cf992a0 am: e78ea75efe

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

Change-Id: Ie2ea3b06adb42f8ea7f595907950a5019f7cd5c5