Android 12.1.0 release 22
Make sure we use device bounds for DrawableOp am: e579754b63 am: 9ba020d4d6

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

Change-Id: If60efe6dd08b48b52a8a2f8844aa7893607e64ee