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

Merge "Retry when manifest broadcast delivery fails." into udc-dev am: 5ed54a50 am: ffe0de28 am: 321f55ff

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



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