Revert^6 "Turn on CombinedMessageQueue for trunk_staging"

This reverts commit 66205110c773e0b9bd680efcb2bbaeaece0a092e.

Reason for revert: fixed b/376602406

Change-Id: I4bf4e3f5e13b7108dc3466452862c24b88766a49
1 file changed