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

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

Change-Id: I4e7011e33a25ff5bebc9d0c905fb88bb13d82fd9