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

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



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