Merge "Marked testFocusedWindowMultipleDisplays as flaky" into pi-dev am: e8b15263e0
am: 2d6384edd7

Change-Id: I128352ed77e6b9d4b50c051ba6cb99437b81112b