Merge "Remove isDataspaceValid" into sc-dev am: 00b9b1190b

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

Change-Id: Id53fa67deb91473517dcb08cf43086b6935247a9