Android VTS 12.1 Release 2 (8513557)
Mark ab/8191998 as merged

Bug: 188847863
Merged-In: I7911e0d3744021902bad197e35d0660160cf1355
Change-Id: Ie4ffb2142c405f96c35030834b69f6c3b1f30de9