Merge "[automerger skipped] Merge "CTS testAspectRatio fail due to using Display.getRealMetrics" into nougat-mr1-cts-dev am: 108d19084d  -s ours" into oreo-cts-dev
am: bd6ca5f8d2

Change-Id: I4957feac9e2992cded825216ea3f04a1e00a4799