Android CTS 7.1 Release 22 (5009338)
Merge "Snap for 4398870 from ad4ee46acf15bece10141015083d02ba4d22613b to nougat-mr1-cts-release" into nougat-mr1-cts-release