Android VTS 8.1 Release 12 (6424701)
Merge "Make change and version bump to OVM1.200423.002" into oreo-mr1-vts-release