Android CTS 8.0 Release 16 (5131714)
Merge "Snap for 4379964 from ba6969bc84c2ebc1f08dc95842d1aa8ef40d2195 to oreo-cts-release" into oreo-cts-release