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

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

Change-Id: I40eb6f8d8ea6924b05da34352dbc9192caa4b82e