Merge "Attempt to reduce flakiness of testDisableRotationCheckForPhone"