Mark ab/6881855 as merged am: 30cb2cc7d2 am: 03629d722f

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

Change-Id: I1f8824527ef30641d5e6ffe2d3d9208182ec13e7