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: eac38f7582 -s ours am: d5415a117e am: c46bfa6e48
am: 11727ef40b -s ours
am skip reason: subject contains skip directive

Change-Id: Ic9c08376a4f55830f8447e38c65f83e6729ad955