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

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

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