[automerger skipped] Merge "Remove deprecated BroadcastOptions." into udc-dev...

[automerger skipped] Merge "Remove deprecated BroadcastOptions." into udc-dev am: 6bfff793 am: 9db848fb -s ours

am skip reason: Merged-In I8db6988d1f3cdfc42c433c4e3d7fde703a647f58 with SHA-1 e9017d2f is already in history

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



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