Merge "CtsVerifier case "Condition Provider test" failed" into nougat-cts-dev
am: 59732add55

Change-Id: I08ed9fd8af1595162e5160f916298abfede8822f