Merge "Modify shader includes to match with vendor code" into udc-d1-dev am:...

Merge "Modify shader includes to match with vendor code" into udc-d1-dev am: 41347b97 am: fd4a05df

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



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