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

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

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