Merge "Protect some device policy broadcasts that are sent by the system" into...

Merge "Protect some device policy broadcasts that are sent by the system" into udc-dev am: 86d5fbbf am: 422d8c01

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



Change-Id: Icaf99a1cc8ba2e4f0ac9f5ab3bd88639562c6103
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>