Merge "Safely handle the case of BroadcastOptions being null." am: bff6b3b979 am: 98fcce4ad4

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

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