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

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



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