Merge "Merge "Prioritize delivering broadcasts to apps with fg activities."...

Merge "Merge "Prioritize delivering broadcasts to apps with fg activities." into udc-dev am: f0f952bb" into udc-mainline-prod am: 195e671f

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



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