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

Change-Id: I2afdfcf16c980a89fb06b1b46fc40962231743cd