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

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

Change-Id: Id97da9dda9bed8c182ea2fcd92c79d94bc619d52