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

Change-Id: I7ae52f1e2ebee73418dfb8c1a847204c5fbc32da