Merge "Fix DualDisplayAreaGroupPolicyTest for non-rotatable devices"