Merge "Generate apex_available from c2a instead of a patch" am: e1535c73f1 am: 7cb0e81dd2 am: 53be829c0f

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/matches/+/1689106

Change-Id: I179fe7f733a50456efce826721dea138c0ca5bb9