Merge "CanvasContext::draw: flushAndSubmit when not drawing" into sc-dev am: 1171be085c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15481327

Change-Id: I4af7f9ddde1273db6aefed5f14fdcaf2d8df36ec