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

Merge "Merge "Set mask shader after matrix is set" into tm-dev am: b6dfbd95 am: 642a6436" into tm-d1-dev-plus-aosp am: 919d2616

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



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