Merge "Reorder test expectations and use AtomicBoolean in postMessageTest" into nyc-support-25.2-dev am: 5602ff75bc
am: fc3a819153

Change-Id: I3324af0f4adf66f6300d27570911849e2ee12246