Android CTS 7.1 Release 24 (5131712)
Merge "Snap for 4892329 from 65e3f75117faf1c57f322ec9e3f1cb291347a585 to nougat-mr1-cts-release" into nougat-mr1-cts-release