Merge "Add BroadcastOptions.setDeferUntilActive() API."