Android VTS 8.1 Release 5 (4918629)
Merge "Snap for 4711598 from af8d1aa02b1148bb5ec05f33bf7914937a3152c1 to oreo-mr1-vts-release" into oreo-mr1-vts-release