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

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

Change-Id: Ica8a5393ccc9366764d5d547c833da9e00b24cda