Merge "Merge "CtsVerifier case "Condition Provider test" failed" into nougat-cts-dev am: 59732add55" into nougat-mr1-cts-dev
am: d1d6dc7306

Change-Id: I919c4aa94fa59b4fbf4db31bd9bd65ece44db025