Merge changes from topic "am-510e537a7c34466d8ed3053298cfa958" into main am: 84aefc94

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



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