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

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



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