[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: 19ec4991 am: 8b74c362 am: 49e5807f -s ours

am skip reason: Change-Id I0aab78954222f0d1cf86a83375a8d0669025144a with SHA-1 5dec2348 is in history

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

Change-Id: I9cef5784c1e98a50d896adec54841964fee9fe84