Merge "Merge "[automerger skipped] Merge "DO NOT MERGE Make A11yMagnificationTest magnification bounds aware" into oreo-mr1-cts-dev am: 7e0c035fab -s ours am: b233e5494d -s ours
am: 05796ed5a7 -s ours
am skip reason: subject contains skip directive

Change-Id: I8a1101eef1b1877fec5bcb86f2e4700f1e96c516