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

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



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