Merge "Retry when manifest broadcast delivery fails." into udc-dev am:...

Merge "Retry when manifest broadcast delivery fails." into udc-dev am: 5ed54a50 am: a98a39ba am: 7b1481e2

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



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