Merge "Merge "Make broadcast protected" into rvc-d1-dev am: 1263a94728 am: 55dd6be49e" into rvc-qpr-dev-plus-aosp