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

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



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