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