Merge "Replace hidden NMS interface to network API" am: 2a40529747 am: 667b09128d

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

Change-Id: Ifc403211281b58bf25c9e7c652a863368b80deae