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