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

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

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