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

Bug: 188847863
Merged-In: Idd8bd9158da6416eb9f4f4c8b94711dc382f7a0f
Change-Id: I2aa878924e1ab63a32d9405c3960e4b14ff354e3