Fix for testFreeformWindowManagementSupport am: 0fe8e72c2f am: e1cfbf8c19 am: 983115c3dc am: 059958fbfa
am: 28ee6a986e

Change-Id: I51700675e1c8768a34389517238f5f32705e0ca4