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

Change-Id: Icd9572f74c831611472c1991d38837c01f7e8beb