[automerger skipped] Merge "Fixes broadcast filtering for multi-user sys apps" into rvc-dev am: 55d0fb08e9 am: 19ec499120 am: 8b74c3624c am: 49e5807f9b -s ours
am skip reason: Change-Id I0aab78954222f0d1cf86a83375a8d0669025144a with SHA-1 5dec234870 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835384
Change-Id: I9cef5784c1e98a50d896adec54841964fee9fe84
This commit is contained in: