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

Change-Id: I069dd3b720e3c9060a05d88083dc5161ffccd888