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

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

Change-Id: Ic88589047f3723b43b5b8b50af673f9f66fff501