Merge "Split networkDestroy() and destroyNetworkCache()" am: 79bb9aa9a4

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

Change-Id: I517e242589fa979826c65817d5918ce05ced9866