Android CTS 8.1 Release 3 (4624669)
Merge "Snap for 4615400 from 23fbf77b8d604a062abbfc53841935e3437876b7 to oreo-mr1-cts-release" into oreo-mr1-cts-release