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

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

Change-Id: I80e43ddd18faf30d5d498f9e071a76e4368ab1ac