Merge "Allow WindowOrganizerController to handle DisplayAreas" into rvc-dev am: 2bac159659

Change-Id: I9e7d9bd9fb8107e09250cf272e4a7c5c0f82b2ac