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