Merge changes from topic "am-f9f678616e16495aa92a52e7e093af0b" into android14-tests-dev am: 09ecd01

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

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

Author: android-build-merge-worker-robot