Android VTS 8.1 Release 4 (4766758)
Merge "Snap for 4711598 from f1d87d06cf9c2d9a47739486fb84306643a828cc to oreo-mr1-vts-release" into oreo-mr1-vts-release