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

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

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