[automerger skipped] Merge "Update the BroadcastQueue logic for runtime...

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

am skip reason: Merged-In I9f12f9e17e61246d723d18ead93c6115bbf6d5cf with SHA-1 1e6a9681 is already in history

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

Change-Id: Ia1474cd68e46f478f8473dedf7180b08d342cb01