[automerger skipped] Merge "Add BroadcastOptions.setDeferUntilActive() API." am: 0c67ec2873 am: 2c011ab832 am: a289cb84b4 -s ours

am skip reason: Merged-In I9a356c8701d73f5687831fbe5b699e4485f07dd5 with SHA-1 3bb8afe601 is already in history

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

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