Merge "Allow WindowOrganizerController to handle DisplayAreas" into rvc-dev am: 2bac1596 am: 5c64d4f2 am: 847ecec4 Change-Id: Iac99bf8da58f5bc14d19e5008c3ed2e4c5c858d1