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

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

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