Merge "Replace hidden NMS permission control API" am: d8288fe344 am: 38be0ff345

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

Change-Id: I45135311ec026b75d1110614f609b851b72f543b