Merge "Clear underlying network info in onDefaultNetworkLost()" am: a4ee732c81 am: 88c8af5a65

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

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