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

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

Change-Id: Ifa1f36f173e02a657776eca2741672280e335e19