[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

Change-Id: I74a3783d95da8b149927dbde0b68502723f05628