Merge changes from topic "am-128b70ede4834fcbb8e184aeedb7ca94" into android14-tests-dev am: 891783bc

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



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