Merge "Make two broadcasts protected" into rvc-qpr-dev am: 5fc03a1663

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4eb00cfb64bb321e9cd84a2d5e32f3996820fbd8