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

Change-Id: I42eea854f89d84e7848a1b6aff1bde0662943004