Merge "Merge "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" into oreo-mr1-cts-dev am: a6798b6586"