Merge "Set mask shader after matrix is set" into tm-dev am: b6dfbd95 am: 642a6436 am: bbfab120

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



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