Android CTS 7.0 Release 24 (4890522)
Merge "Snap for 4890173 from 5f2cdbfbb1897bd97ffd117049195227afb738ed to nougat-cts-release" into nougat-cts-release