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

Change-Id: I390a3cf2f6a103d77a7dbcf9c53991a18a756624