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

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



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