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