Merge the 2021-09-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  Only treat PNG_COLOR_TYPE_RGB as 565

Change-Id: I205e28262c888b81014fb6f09097dbbf3b7e25f2