Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Update...

Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Update magnification region before the test." into oreo-cts-dev am: 6c959b08  -s ours" into oreo-mr1-cts-dev am: 47d9d50a  -s ours" into pie-cts-dev am: 0ddfaf75  -s ours"
am: 9458baef  -s ours

Change-Id: Ifc85a4444f97c0d370a172b8b5ce5bac7841d3bb