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

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

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