Merge "Avoid sending empty bitmaps through proxy canvas" into master-skia

https://skia.googlesource.com/skia/+/2df6fd650cb12af8eeb7884b2819d2bf8ba7a5bf

Change-Id: Iaa80b9435e455342b681ba6aad6e3cabac90d260