[automerger skipped] Merge "Safely handle the case of BroadcastOptions being...

[automerger skipped] Merge "Safely handle the case of BroadcastOptions being null." am: bff6b3b9 am: 98fcce4a am: a0349424 -s ours

am skip reason: Merged-In I0847a189bf945d8aa051133c7cff277a8692272d with SHA-1 51a6ae01 is already in history

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



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