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: af608153 am: ef2fb055

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



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