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

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



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