[automerger] Merge "CtsVerifier case "Condition Provider test" failed" into nougat-cts-dev am: 59732add am: efef0f47 Change-Id: I1a18c547f3e1ea8791826cee9e90bce45e9d094c