Android CTS 7.0 Release 18 (4581285)
merge in nougat-cts-release history after reset to nougat-cts-dev