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

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

Change-Id: Ib53b5efe2af87f21563de0d883fce86afbdb89d7