Merge changes from topic "am-5945f34d83bd47e39e93546db3757d9d" into main am: eb2dc1c5d5 -s ours

am skip reason: Merged-In I551e14fa6a0c63e3cef334b953f670cf9c465e10 with SHA-1 36981b54f0 is already in history

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

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