[automerger skipped] 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 skipped: 323c6cfe38

Change-Id: I3b222fdbbacbf42063760c41bee2295917115ebf