Merge changes from topic "am-82ee14b604194a25ae9e941a47af245c" into main am: e97589f4 -s ours

am skip reason: Merged-In Ic8ae72898b8ab6067402b26eef9ed1b876a778f7 with SHA-1 04fca7f8 is already in history

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



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