Merge "Clear the information of the underlying network" am: c232ead59f am: a86d00fab9

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

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