Merge "Retry when manifest broadcast delivery fails." into udc-dev am: 5ed54a50 am: 682cd0c7

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



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