Android CTS 7.1 Release 13 (4486237)
Merge "Snap for 4485191 from 2ea5a39d763d021d26d24650bfc91269a9f0196b to nougat-mr1-cts-release" into nougat-mr1-cts-release