[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 skipped: skipped: 5c1c1cceed am: bfbad41048 am: 48e0c9ab5a
am: b8b805846e  -s ours

Change-Id: Ib840973e95dc21d059a23d75b2c0543bc3a35461