Merge "Move tests from DisplayPolicyLayoutTests to WindowLayoutTests"