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