[automerger skipped] Mark ab/8191998 as merged am: 379c8d8a59 -s ours am: 67046c5998 -s ours am: 1d27657ddf -s ours am: fd080e356a -s ours

am skip reason: Merged-In Ifa2615e2a1d0361f6166c519b32a98c60a7c2f7b with SHA-1 573ca6065b is already in history

Original change: https://android-review.googlesource.com/c/platform/test/framework/+/2037243

Change-Id: I05e22f164c2af15d4135cf364c35198a72550ec1