Merge "Merge "Merge "Merge "CtsVerifier case "Condition Provider test" failed" into nougat-cts-dev am: 59732add" into nougat-mr1-cts-dev am: d1d6dc73" into oreo-cts-dev am: 01d8d29f" into oreo-mr1-cts-dev am: fc914074 Change-Id: Ic77fa75e9b03fff5992b8a41387526499c06f45a