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

Change-Id: If55f8d27662e43bb1bcd5d05cda026b7a12e61e2