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

Change-Id: Ia852610985da8e92b8e6c8615b7f6572974c3945