[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 am: 26735977 -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: If2ab65c0f704617fcc1ab4248df1d25982f3f0a6