Android VTS 8.1 Release 6 (5035638)
Merge "Snap for 4711598 from ab6bf6c760aa5a6158b8eb14a20a0b30a6981491 to oreo-mr1-vts-release" into oreo-mr1-vts-release