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