Merge "Add NMS broadcasts to protected list" into sc-dev am: 92145ddf77

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

Change-Id: Ic1110f3618171322349346d017938c3248b7845a