Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Revised test to accurately check for errors" into nougat-cts-dev am: 711fab5cf0  -s ours" into nougat-mr1-cts-dev am: 56baf65345  -s ours" into oreo-cts-dev