Merge "[automerger skipped] Merge "Update the BroadcastQueue logic for runtime permissions" into sc-v2-dev am: 1c6635fe76 am: b7c2ca6896 -s ours"