Android CTS 8.0 Release 7 (4624670)
Merge "Snap for 4379964 from aa99529371cce8c8734d04cc9292853ab9a0d843 to oreo-cts-release" into oreo-cts-release