Reland "Re-enable CCPR atlasing + reordering"
Reland "Re-enable CCPR atlasing + reordering"

This reverts commit 6924597f2a3e7c741a7f678b185cf987981c19b2.

Reason for revert: didn't break chrome roll

Original change's description:
> Revert "Re-enable CCPR atlasing + reordering"
>
> This reverts commit 4b6b1dd2180ede7ec944d77b295095b6dfcf6416.
>
> Reason for revert: random guess for chrome roll pixel test failure
>
> Original change's description:
> > Re-enable CCPR atlasing + reordering
> >
> > CCPR atlasing now handles merged tasks correctly so they can work
> > together happily again.
> >
> > Bug: skia:10877, skia:11731
> > Change-Id: Id15c8fc3ed0560150f5c373651f5c583239f3e09
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/404136
> > Commit-Queue: Adlai Holler <74c8d5b16bacf4a5997d6535bb4043bbdfe052ea@google.com>
> > Reviewed-by: Robert Phillips <95e8ac5504948c7bf91b22c16a8dbb7ae7c66bfd@google.com>
>
> TBR=95e8ac5504948c7bf91b22c16a8dbb7ae7c66bfd@google.com,74c8d5b16bacf4a5997d6535bb4043bbdfe052ea@google.com
>
> Change-Id: I2f66c025702c023989c6cbd7ef0f73f4f35738df
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:10877
> Bug: skia:11731
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/404456
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>

# Not skipping CQ checks because this is a reland.

Bug: skia:10877
Bug: skia:11731
Change-Id: I3556f21768b097a3de892996be3c65d76b140b4d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/404782
Reviewed-by: Robert Phillips <95e8ac5504948c7bf91b22c16a8dbb7ae7c66bfd@google.com>
Commit-Queue: Adlai Holler <74c8d5b16bacf4a5997d6535bb4043bbdfe052ea@google.com>

google/skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,google/skia,google/skia,google/skia,google/skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,google/skia,google/skia,aosp-mirror/platform_external_skia,google/skia,aosp-mirror/platform_external_skia,google/skia,aosp-mirror/platform_external_skia,google/skia,aosp-mirror/platform_external_skia