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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I125d0c3d5152da5bc8ef2896cf50ad5a6452e818