Merge tag 'android-security-11.0.0_r57' into int/11/fp3

Android security 11.0.0 release 57

* tag 'android-security-11.0.0_r57':
  Only treat PNG_COLOR_TYPE_RGB as 565

Change-Id: I655ea2ee7aa739e46f49d3f9e612da0978185eb9