Merge "Fix Canvas#drawVertices color blending when no shader is provided" into...

Merge "Fix Canvas#drawVertices color blending when no shader is provided" into tm-qpr-dev am: 716c5618

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



Change-Id: I759f579b9e468673c85d9388f5165826e85562f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>