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

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

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