Merge "Fixed cts for data only device." into android13-tests-dev am: 96a77830b0

Original change: https://android-review.googlesource.com/c/platform/cts/+/2722913

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