Merge "Modify shader includes to match with vendor code" into udc-d1-dev am: 41347b9771 am: 6df3cb9fb8 am: 537429e76c

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

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