Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: increase Maximum allowable number of consecutive failed pixels" into nougat-cts-dev am: 59db42d8d7  -s ours" into nougat-mr1-cts-dev am: c7b7bb4050  -s ours" into oreo-cts-dev am: 2e7a17f7e4  -s ours" into oreo-mr1-cts-dev
am: c2eb744402  -s ours

Change-Id: I4c3c4fdd5617cea91643c479eb382a876cd62bdf