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

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

Change-Id: I4cd75254a26106103352c98d3fefe4a275c83bed