[automerger skipped] Merge "Fixes broadcast filtering for multi-user sys apps"...

[automerger skipped] Merge "Fixes broadcast filtering for multi-user sys apps" into rvc-dev am: 55d0fb08 am: f75666d1 -s ours am: 26888e8f -s ours

am skip reason: Change-Id I0aab78954222f0d1cf86a83375a8d0669025144a with SHA-1 7ecbe5b5 is in history

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

Change-Id: If823b9d0f81909ec3654dc230de0e47e6d686faa