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 skip reason: subject contains skip directive"