Merge "Fix backgroundPixels comparison for testLightStatusBarIcons and testLightNavigationBar." into oreo-mr1-cts-dev
am: 93e03c290b

Change-Id: Iac1ed42aabecdbbb8bfdc405beeff58ec55d29b7