Merge "Add BroadcastOptions.setDeferUntilActive() API." am: 0c67ec2873

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

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