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

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

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



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