Merge "c2a: Automatically make crates APEX available" am: d0e21e93fb am: b30e1dae5b

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

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