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

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



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