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: 006efbee am: 2aaa9735

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



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