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

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

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