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

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

Change-Id: I051949e9d1c8ee60e5366a96ba8afb10c92e1691