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

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

Change-Id: I479f3bb79cde99d40651af622404b013dfe0882c