Merge changes from topic "send-ordered-broadcast-multiple-permissions" into main am: 2e2b72f8

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



Change-Id: I789b608e84860f054bc8e8dac76e55e59ff55223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>