Merge "Allow WindowOrganizerController to handle DisplayAreas" into rvc-dev am: 2bac1596 am: 25402d17 am: a89c9dc6 Change-Id: Ic2494833dab593a2e53ba3817c7eb6c6a1d73689