Merge changes from topic "am-10703a0639174d02b5c360b4008fe9ef" into android14-tests-dev am: fe7e0ac am: 784443e

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

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

Author: android-build-merge-worker-robot