[automerger skipped] Merge "Expose BroadcastOptions public constructor" into...

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

am skip reason: Merged-In I7f28ba3caf4f3822895fba276e76980d56097ef6 with SHA-1 51f52d80 is already in history

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



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