Merge "Merge "CtsVerifier case "Condition Provider test" failed" into nougat-cts-dev am: 59732add" into nougat-mr1-cts-dev am: d1d6dc73 Change-Id: I4d355210eef38df20bc9c0d0bf8f2ba1de03bbf1