[automerger] Merge "Merge "CtsVerifier case "Condition Provider test" failed" into nougat-cts-dev am: 59732add55" into nougat-mr1-cts-dev am: d1d6dc7306 am: 71b808e6cd

Change-Id: Ieafbb8b29f40af0a855c6fa45d057c349874e9af