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
am: 2e65d303a2

Change-Id: I65435213eeb345ca54e6d4111ce9adc3a9da8ec4