Revert "Revert "Include color type and color space in bitmap cache key""

This reverts commit 9ff04c00f3724a7a4ddd4052cb20c6098a23279e.

Bug: skia:
Change-Id: If35b2f6ea306f93d01350e7bd2de1756935fcc32
Reviewed-on: https://skia-review.googlesource.com/c/160840
Auto-Submit: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
7 files changed