Merge changes from topic "am-3797f752724847688785f181e6dceaab" into main am:...

Merge changes from topic "am-3797f752724847688785f181e6dceaab" into main am: ff26bd34 am: 9d6a47f2

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



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