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