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

[automerger skipped] Merge "Update the BroadcastQueue logic for runtime permissions" into sc-qpr1-dev am: 5f5ed92f -s ours am: 792c45f2 -s ours

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

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

Change-Id: I00ff8e6d43de37c8a46512d1d5c7b27fef70ade4