Merge "Skip Magnification test if not on primary display" into oreo-cts-dev