Merge "Apply deferred state correctly to newly replaced bcasts." into main am: 6eff722d

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



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