Merge "Merge "CTS: testMaxAspectRatioResizeableActivity on Default Display only" into oreo-cts-dev am: 26b89d482f" into oc-dev
am: d0ea3ca8dd

Change-Id: I48c682d7332d5a99d20bc5faf61b0a2393d55eb2