[automerger skipped] Merge "Apply deferred state correctly to newly replaced bcasts." into main am: 6eff722dc8 am: bb431f8a7a -s ours

am skip reason: Merged-In Iffb55f30816bd5e13f6992c434dc2cba7699b6a1 with SHA-1 ed480b67b3 is already in history

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

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