[automerger skipped] Merge "Fix sidecar deps" into main am: 23b24dad am: 9aa8ddb5 -s ours

am skip reason: Merged-In I5e202dcbff4b5f754b9ceb82ec59569e58c33238 with SHA-1 177864ed is already in history

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



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