Merge "Generate apex_available from c2a instead of a patch" am: e1535c73f1

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

Change-Id: I1466252ac360c97bfdfd877ecaf329db4d1e40e2