Merge "Avoid  fail in testCapabilities" into android13-tests-dev am: 7026e2c8d6

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

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