[automerger skipped] Merge changes from topic "send-ordered-broadcast-multiple-permissions" into main am: 2e2b72f8 am: 5757ea3e -s ours

am skip reason: Merged-In I308f965802aff385914d514e0bc50a1e716e096e with SHA-1 a998b903 is already in history

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



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