Revert "Re-enable CCPR atlasing + reordering"
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 <adlai@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>

TBR=robertphillips@google.com,adlai@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 <39df0a804564ccb6cf75f18db79653821f37c1c5@google.com>
Commit-Queue: Greg Daniel <39df0a804564ccb6cf75f18db79653821f37c1c5@google.com>

google/skia,google/skia,aosp-mirror/platform_external_skia,google/skia,aosp-mirror/platform_external_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,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,google/skia,google/skia,aosp-mirror/platform_external_skia,google/skia,google/skia,aosp-mirror/platform_external_skia,google/skia