Merge "Fix the order of applying layer alpha and color matrices in GLESRenderEngine" am: 4d05aface8 am: f1261afd7a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1473596

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b7a1404ffa1d8ba5d939e241de6933a9ee9a70a