Android VTS 8.1 Release 12 (6424701)
Merge "Snap for 6421779 from 31690d4cf4b57c8079036a38952ad1f711513873 to oreo-mr1-vts-release" into oreo-mr1-vts-release