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

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



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