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