[automerger skipped] 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 am: e2c306864e am: cfe7044905 skipped: c731a9a159

Change-Id: I9ba35f11436c3d5164310ea5a14c0e0b5b2a568a