Merge "Clear the information of the underlying network" am: c232ead5 am:...

Merge "Clear the information of the underlying network" am: c232ead5 am: a86d00fa am: 30af21c6 am: 4af924d4 am: dfdf4fc9

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



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