[automerger skipped] Merge "DO NOT MERGE: Revised test to accurately check for errors" into oreo-cts-dev am: f789a8aa0d  -s ours am: 1d625eecab am: 346c739e3a  -s ours
am: 430d6fbcbb  -s ours

Change-Id: Ib08ff0c978e5ab27144ed75ffc0831251e5f75f1