Android CTS 7.1 Release 17 (4723909)
Merge "Snap for 4721182 from 0728ef972d1003a16ab1a30c34d873b06c4e09bd to nougat-mr1-cts-release" into nougat-mr1-cts-release