Merge "Set mask shader after matrix is set" into tm-dev am: b6dfbd95 am: 08e2c2d1

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



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