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