Merge "WM: Make maxAspectRatio work with display cutouts" into pi-dev am: ab4670351d
am: 830bf102ec

Change-Id: Ia4c86ffb4e0f4c0628e598724683ba73b2a63fa0