Merge "Use the correct dataspace in shaders.cpp" into tm-dev am: 0a331467...

Merge "Use the correct dataspace in shaders.cpp" into tm-dev am: 0a331467 am: 4b3b865e am: f3452fa6 am: ab1e8489

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



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