Mark ab/6881855 as merged am: 06dac175f1 am: 1a84e3d749

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/13112961

Change-Id: Ibd4fdfeb1cecd67e553f7130bd1f3caebeb0fd9f