Merge "Change some DataSpaceTest case due to vendor driver issue." into stage-aosp-tm-ts-dev