Merge "Update the BroadcastQueue logic for runtime permissions" am: 1465700c am: 58c6e7f1 am: 9145c9c1 am: f062d787

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

Change-Id: I7976af41544306013e225063d563fd40278324a6