Android CTS 7.1 Release 20 (4892579)
Merge "Snap for 4892329 from e090519020183d8bf7a627e4ef209d82bb22101e to nougat-mr1-cts-release" into nougat-mr1-cts-release