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

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

Change-Id: I5f06041a559f2f52c7aa0f648af2003686331e0c