Merge "Merge "Skip Magnification test if not on primary display" into oreo-cts-dev am: f2f392769b" into oreo-mr1-cts-dev