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

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

Change-Id: I3d4cec406a07e9c069b52dac62012ebaa5557de8