[automerger skipped] Only treat PNG_COLOR_TYPE_RGB as 565 am: 6a2a767f72 -s ours am: b68bf92741 -s ours am: a226a89970 -s ours am: 41a1fcde5d -s ours

am skip reason: Merged-In I15d9571398870ecf67a150e46d28d4545afcf3c8 with SHA-1 f6de97fce5 is already in history

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

Change-Id: I98114aa01fefa22d9bb009097a247d074414e70c