[automerger skipped] Merge "Fix the order of applying layer alpha and color matrices in GLESRenderEngine" am: 4d05aface8 am: f1261afd7a am: 66647d87b9 -s ours

am skip reason: Change-Id I206184aae84042290b00e411709e04e54579780a with SHA-1 da2845cb49 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ab73f634bf5a6f9ef156d7afc439c080b44a520