[automerger skipped] Merge Android R am: 748c4d5c0b -s ours am: 2786c6a969 -s ours

am skip reason: Change-Id Ib6931e3695458d743667dff2d59acfd156415019 with SHA-1 e3b1744330 is in history

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

Change-Id: Ie237b4b66f28c45e26f214e5ebdc942e24276ee8