Merge "[rkp] Make android.security.rkp_aidl-rust available to virt apex" into main