Android CTS 7.1 Release 21 (4976769)
Merge "Snap for 4971769 from a17fcede71eda0b79737a3f1508c17ac91c48dec to nougat-mr1-cts-release" into nougat-mr1-cts-release