Merge "Require texStorage or sized texImage to use RGBX format in GL." am: e4e571c531 am: c797c9c667

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

Change-Id: I0c30d3032e5bdbea550b3da39957cdcbd2b4130f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>