Merge "Merge "DO NOT MERGE: cherry-pick from the android o(cts) to fix the the magnification test" into nougat-mr1-cts-dev am: 2e8aa2f2ce  -s ours" into oreo-cts-dev am: 6268096bf4  -s ours am: d0977d83b3
am: 99b88e9625

Change-Id: I9266ba6f4770a098914be18a32de3b449ccf4445