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

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



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