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