Merge "Fix cargo2rulesmk.py handling of optional deps" into main am: fa5f3619e6

Original change: https://android-review.googlesource.com/c/platform/development/+/2883319

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