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

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

Change-Id: Ie55d43f42235fbfc570f8088a9459dba99008799