Merge "Replace waitForBroadcastIdle with explicit polling" into stage-aosp-rvc-ts-dev