Merge "CanvasContext::draw: flushAndSubmit when not drawing" into sc-dev am: 1171be08 am: 973eac4b am: d366f1bb am: 2e40e706

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

Change-Id: I04d5812e81155a5d66914c860880b07330654f4b