Android CTS 7.1 Release 16 (4660795)
Merge "Snap for 4654396 from 8d7a3d49cb2ab78147e9bc659b263ba1b429ad6d to nougat-mr1-cts-release" into nougat-mr1-cts-release