Merge "[automerger skipped] Merge "CTS testAspectRatio fail due to using Display.getRealMetrics" into nougat-mr1-cts-dev am: 108d19084d  -s ours skipped: d488ffe953 skipped: 09d6837dbf skipped: 0b9763f64d am: 438cc1be03 am: c35398e887" into oc-mr1-dev am: 5d00cdcb50
am: a99c39186f

Change-Id: Ia2281131664619d18717c6f609de97b269737cb5