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

Change-Id: I6f54cb995b302d0df06a07b09c85b5d153947ca6