[automerger skipped] Merge "Expose BroadcastOptions public constructor" into udc-dev am: e1295fff -s ours

am skip reason: Merged-In I7f28ba3caf4f3822895fba276e76980d56097ef6 with SHA-1 37e7ac9b is already in history

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



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