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
am: 4a7c29dddf

Change-Id: I5611502d73b6effb89a5d0d33eea83e9e3db2331