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

Change-Id: Ie91d6613784988c1910e64ff8b7fe7476a0a1a70