Merge changes from topic "am-dee1b80a153d4b548dc5f878f431a3e9" into android14-tests-dev am: 99356c9a85

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

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