Merge changes from topic "am-233042b8d4194015b3e2cf0f69bfda1b" into android14-tests-dev am: 4f0f22ed

Original change: https://android-review.googlesource.com/c/platform/build/+/3198231



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