Merge "Revert "Remove incorrect isDataSpaceValid"" into udc-dev am: aa57d0f5 am: 3a45d9ef

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



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