Merge "Fix bug around deferred prioritized broadcasts." into udc-dev am: f3306444

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



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